From 016ef02e8784978cf789067f4fbe6eb97b0c775b Mon Sep 17 00:00:00 2001 From: "cl349@firebug.cl.cam.ac.uk" Date: Mon, 28 Nov 2005 18:07:22 +0100 Subject: [PATCH] Move mk-symlinks target into tools/Rules.mk. Signed-off-by: Christian Limpach --- tools/Rules.mk | 13 +++++++++++++ tools/blktap/Makefile | 11 ----------- tools/libxc/Makefile | 11 ----------- tools/security/Makefile | 11 ----------- 4 files changed, 13 insertions(+), 33 deletions(-) diff --git a/tools/Rules.mk b/tools/Rules.mk index b1c4a6d004..2a003b1d7a 100644 --- a/tools/Rules.mk +++ b/tools/Rules.mk @@ -1,5 +1,8 @@ # -*- mode: Makefile; -*- +# `all' is the default target +all: + include $(XEN_ROOT)/Config.mk XEN_XC = $(XEN_ROOT)/tools/python/xen/lowlevel/xc @@ -27,3 +30,13 @@ X11_LDPATH = -L/usr/X11R6/$(LIBDIR) %.o: %.cc $(CC) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< + +mk-symlinks: LINUX_ROOT=$(XEN_ROOT)/linux-2.6-xen-sparse +mk-symlinks: + mkdir -p xen + ( cd xen && ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) + mkdir -p xen/io + ( cd xen/io && ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) + mkdir -p xen/linux + ( cd xen/linux && \ + ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . ) diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index fab85d1adc..d5d6f3eab3 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -47,17 +47,6 @@ all: mk-symlinks libblktap.so #blkdump $(MAKE) -C $$subdir $@; \ done -LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse) -mk-symlinks: - [ -e xen/linux ] || mkdir -p xen/linux - [ -e xen/io ] || mkdir -p xen/io - ( cd xen >/dev/null ; \ - ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) - ( cd xen/io >/dev/null ; \ - ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) - ( cd xen/linux >/dev/null ; \ - ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . ) - install: all $(INSTALL_DIR) -p $(DESTDIR)/usr/$(LIBDIR) $(INSTALL_DIR) -p $(DESTDIR)/usr/include diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index 08eb0c42a0..a077ad42e6 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -83,17 +83,6 @@ check-for-zlib: false; \ fi -LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse -mk-symlinks: - [ -e xen/linux ] || mkdir -p xen/linux - [ -e xen/io ] || mkdir -p xen/io - ( cd xen >/dev/null ; \ - ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) - ( cd xen/io >/dev/null ; \ - ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) - ( cd xen/linux >/dev/null ; \ - ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . ) - install: build [ -d $(DESTDIR)/usr/$(LIBDIR) ] || $(INSTALL_DIR) $(DESTDIR)/usr/$(LIBDIR) [ -d $(DESTDIR)/usr/include ] || $(INSTALL_DIR) $(DESTDIR)/usr/include diff --git a/tools/security/Makefile b/tools/security/Makefile index 0d95a9b93f..80611835c3 100644 --- a/tools/security/Makefile +++ b/tools/security/Makefile @@ -69,14 +69,3 @@ $(POLICYFILE) : build boot_install: $(POLICYFILE) @cp $(POLICYFILE) /boot @./updategrub.sh $(POLICY) $(PWD)/$(XEN_ROOT) - -LINUX_ROOT := $(XEN_ROOT)/linux-2.6-xen-sparse -mk-symlinks: - [ -e xen/linux ] || mkdir -p xen/linux - [ -e xen/io ] || mkdir -p xen/io - ( cd xen >/dev/null ; \ - ln -sf ../$(XEN_ROOT)/xen/include/public/*.h . ) - ( cd xen/io >/dev/null ; \ - ln -sf ../../$(XEN_ROOT)/xen/include/public/io/*.h . ) - ( cd xen/linux >/dev/null ; \ - ln -sf ../../$(LINUX_ROOT)/include/asm-xen/linux-public/*.h . ) -- 2.30.2